Update.

        * gdk/tmpl/properties.sgml, gdk/tmpl/events.sgml,
        gdk/tmpl/regions.sgml, gdk/tmpl/general.sgml,
        gdk/tmpl/keys.sgml: Update.

        * gdk/gdk-overrides.txt, gdk/gdk-sections.txt: Remove nanox traces.

diff --git a/docs/reference/gdk/gdk-overrides.txt b/docs/reference/gdk/gdk-overrides.txt
index 14eed8115955297a6313813504ea027a2a8bd6ae..ff7d773a1dff7dd30e77724941986053dbd77f18 100644 (file)
--- a/docs/reference/gdk/gdk-overrides.txt
+++ b/docs/reference/gdk/gdk-overrides.txt
@@ -39,11 +39,6 @@ struct GdkDrawable
 #define GDK_WINDOWING_WIN32
 </MACRO>
 
-<MACRO>
-<NAME>GDK_WINDOWING_NANOX</NAME>
-#define GDK_WINDOWING_NANOX
-</MACRO>
-
 <MACRO>
 <NAME>GDK_WINDOWING_FB</NAME>
 #define GDK_WINDOWING_FB

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 803885d2e7130d88074de10770e01068705ceb8b..f3e44cccb292a62137c1bf1b74a59a9c1d19481c 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -52,7 +52,6 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_NANOX
 GDK_WINDOWING_FB
 
 <SUBSECTION Standard>

diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index 4d75db6a7526fdb0fa6debdcc0da22794246ad32..f7955489a72ba1e23210a197f5b30522a2f09533 100644 (file)
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -141,7 +141,8 @@ This is the priority that events from the X server are given in the
 
 <!-- ##### MACRO GDK_PRIORITY_REDRAW ##### -->
 <para>
-
+This is the priority that the idle handler processing window updates
+is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 </para>
 
 

diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index abb933b56a318cee57c4ed1e4316a02a74660e55..849da55ec7b101eef73d9419040e56ee43aa8fa9 100644 (file)
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -115,18 +115,21 @@ of g_atexit()).
 
 <!-- ##### FUNCTION gdk_get_program_class ##### -->
 <para>
-
+Gets the program class. Unless the program class has explicitly
+been set with gdk_set_program_class() or with the <option>--class</option> 
+commandline option, the default value is the program name (determined 
+with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
-@Returns: 
+@Returns: the program class. 
 
 
 <!-- ##### FUNCTION gdk_set_program_class ##### -->
 <para>
-
+Sets the program class.
 </para>
 
-@program_class: 
+@program_class: a string.
 
 
 <!-- ##### FUNCTION gdk_get_display ##### -->

diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index 907d4d5499b0679070ac7e974aff787c4f83c0ca..7ce60f16abe871bd551ce2747f74dbe8ca523420 100644 (file)
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -171,11 +171,11 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 
 <!-- ##### FUNCTION gdk_keymap_get_direction ##### -->
 <para>
-
+Returns the direction of the keymap. 
 </para>
 
-@keymap: 
-@Returns: 
+@keymap: a #GdkKeymap or %NULL to use the default keymap.
+Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 
 
 <!-- ##### FUNCTION gdk_keyval_name ##### -->

diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml
index caee1ac68c669eb04fec83e06ee40ad30abc6884..d2bbbc0d99da6c5f347a0637bf0a9e1250d1b60f 100644 (file)
--- a/docs/reference/gdk/tmpl/properties.sgml
+++ b/docs/reference/gdk/tmpl/properties.sgml
@@ -51,7 +51,8 @@ of strings on the X server.
 
 <!-- ##### MACRO GDK_NONE ##### -->
 <para>
-
+A null value for #GdkAtom, used in a similar way as <literal>None</literal>
+in the Xlib API.
 </para>
 
 

diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index 77b197f74df697d355ad96adc2f2c2a32672d99c..0f3072fc6680c2801b899f05f0c4c93fec29b6ee 100644 (file)
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -291,32 +291,36 @@ or the other of the two sources but not in both.
 
 <!-- ##### STRUCT GdkSpan ##### -->
 <para>
-
+A GdkSpan represents a horizontal line of pixels starting
+at the pixel with coordinates @x, @y and ending before @x + @width, @y.
 </para>
 
-@x: 
-@y: 
-@width: 
+@x: x coordinate of the first pixel.
+@y: y coordinate of the first pixel.
+@width: number of pixels in the span. 
+
 
 <!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
 <para>
-
+This defines the type of the function passed to 
+gdk_region_spans_intersect_foreach(). 
 </para>
 
-@span: 
-@data: 
+@span: a #GdkSpan. 
+@data: the user data passed to gdk_region_spans_intersect_foreach().
 
 
 <!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
 <para>
-
+Calls a function on each span in the intersection of @region and
+@spans.
 </para>
 
-@region: 
-@spans: 
-@n_spans: 
-@sorted: 
-@function: 
-@data: 
+@region: a #GdkRegion. 
+@spans: an array of #GdkSpans.
+@n_spans: the length of @spans.
+@sorted: %TRUE if @spans is sorted wrt. the y coordinate.
+@function: function to call on each span in the intersection.
+@data: data to pass to @function.